Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Handle when DestroyStructure API passes null to the IL marshaller #61985

Merged
merged 1 commit into from
Nov 24, 2021
Merged

Handle when DestroyStructure API passes null to the IL marshaller #61985

merged 1 commit into from
Nov 24, 2021

Conversation

AaronRobinsonMSFT
Copy link
Member

@AaronRobinsonMSFT AaronRobinsonMSFT commented Nov 23, 2021 •
edited
Loading

During the clean up phase for IL marshallers, managed value types passed as nullptr can cause failures.
This is an issue with field marshallers of nested non-blittable types only.

runtime/src/coreclr/vm/marshalnative.cpp

Lines 228 to 238 in f24b363

else if (th.HasLayout())
{
MethodDesc* structMarshalStub;
{
GCX_PREEMP();
structMarshalStub = NDirect::CreateStructMarshalILStub(th.GetMethodTable());
}
MarshalStructViaILStub(structMarshalStub, nullptr, ptr, StructMarshalStubs::MarshalOperation::Cleanup);
}

Fixes #61839

/cc @jkoritzinsky @elinor-fung

@AaronRobinsonMSFT
The DestroyStructure API passes null to the IL marshaller for
efb936d 
  managed valuetypes. This is an issue with field marshallers of
  nested non-blittable types.
@AaronRobinsonMSFT AaronRobinsonMSFT added this to the 7.0.0 milestone Nov 23, 2021
@AaronRobinsonMSFT
Copy link
Member Author

/backport to release/6.0

@github-actions
Copy link
Contributor

Started backporting to release/6.0: https://github.com/dotnet/runtime/actions/runs/1497375119

@github-actions github-actions bot mentioned this pull request Nov 24, 2021
Merged
@AaronRobinsonMSFT AaronRobinsonMSFT merged commit 7cfcbb0 into dotnet:main Nov 24, 2021
@AaronRobinsonMSFT AaronRobinsonMSFT deleted the runtime61839 branch November 24, 2021 19:23
This was referenced Nov 29, 2021
Closed
Closed
Closed
Closed
Closed
Closed
Closed
@ghost ghost locked as resolved and limited conversation to collaborators Dec 25, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@jkoritzinsky jkoritzinsky jkoritzinsky approved these changes

Assignees
No one assigned
Labels
area-Interop-coreclr
Projects
None yet
Milestone
7.0.0
Development

Successfully merging this pull request may close these issues.

NullReferenceException in Marshal.DestroyStructure with embedded structs containing delegates
2 participants
@AaronRobinsonMSFT @jkoritzinsky